Finished layout and routes, added Users