Update improved layout