Improve formatting on application layout

Just changes to newlines and indentation, no functionality changes.