housekeeping with new layout pt 1