Messed up previous commit, updated routes and finished layout