fix landing page
refactor controller and model code