Layout tweaks

Just some general formatting and layout tweaks, including a fix for https://github.com/MarkUsProject/Markus/issues/1490.