Finish ch 5, layouts, add user controller