shorter rspecs
Finish layout and routes