restarting comp layout/routes
fixed layout bugs