redo the layouts as it should