Added UI forms
Fixes #2