Revamp layout