Work in progress, moving to the new bootstrap and changing page layout and routing