Updated quote single controller and layouts