Light refactoring views(form). closes #13