Improved template editor UI
Fixed up objective display UI