Removed nbsp
Cleaned up form