updating form class and updating menu labels