Align form with new classes