made header show when scrolling - footer at bottom
fixing merge conflicts