#16 Shifted Headers into new Header Container; Misc design changes