Extend functionality of front page and home page views
Fix merge conflicts