Fixed user form and currently implementing buttons
Resolving merge conflicts
resolving conflicts