Fixed display when adding/editing
Refactored html to look cleaner