Redoing page layout, modifying banner
Fixing stuff up for git merge