Updated layout and customized routes