Started work on tidying up. Everything is centered vertically now.
ref #2110