finished new layout