new layout in place. just small tweaks now