move ui classes around