Fixing layout and button issue
Tidies up header and button code + removed old