Fix issue with main layout