Restructured templates, modified home page and profile page