beginning switch to new layout