Also updated main layout