More refactoring, UIchanges, can choose old layout style or new layout style with switch