Done with home page and login page
Done with merging