Updated the main layout and index