avoid $ in controller
icon title
minor style tweaks