code polishing
use template engine
new icon; native menu entries
style updates