Cleaned up form
Cleaned up master template