log in no longer crashes, header and footer
merge