Refactor layout and user model, showcase books