dev

working new layout