Finish layout, cleanup and routes