UI improvements and added some templates for funzies