even better update to layout