Fixed the main layout