Styling and controller template tweak