Roger Dubbs

Note that the issues noted by DangerBotOSS are all pre-existing issues. The scope of these changes was meant to be fixing the layouts. (I did run prettier on the whole...

Ready to merge

For what it's worth, I need this also.

I saw a NullPointerException I think. I'm not really sure where to look in logs and such.