some refactoring and forms are now blue