Added layouts, changed routes