Major refactor, main-content ready for bootstrap