Fix: some issues with classes working for new forms and buttons