changed layout, fix routes, REST