Made Main layout and some other stuff