working on the new layout