Improve rendering with icons
Wrap some label functions as button functions