-- Modified layout again, making it look less like a hairball.

Signed off by: Mark Farrell<markfarr2011@gmail.com>