Added dynamic content to home page
Fixed merge conflicts and added dynamic content to home page