Additional ui tweaks to base and note templates