Improve Classes Form