Added some modifications to main layout