duplicated some changes
Updated to proper routing and layout