Added images, refactored forms, branching next