got new layout to work