updated main controller, updated layout, updated css