Major improvements

Major improvements all 'round!

(Header and footer have been removed for now.)