new layout working better