Finish layout and added user routes