Finish layout and routes
Bootstrap 3 & new tests