Minor layout and adjustments

Nothing worth mentioning. It's easier just to view the diff.