Updated whole layout