Adding title bar icon
Fixing typo, modifying TODO slightly