Moved some modules around; deleted redundant masthead module
A bunch of design cleanup