Merged Ashish's changes & made the initial basic layout