Fix app header and general clean up