Added segment control for class and buttons removed