Added levels and refactored forms