Form redesigns + Bug fixes

Fixes #41 #42