Updates to fix a couple layout issues.

Quick fixes. The buttons' stuff we'll need to eventually address to see if it remains in this module or outside; but alas, it is a convo for another day.

@DFurnes