Remove unused views
Force time format to be uppercase
Improve nested form style
Formatting