edited layout once again