Layout fixes

Some layout fixes thanks to talking to a UI dev.