moved main controller up to body tag
fixing merge conflicts