Fixed bug where null command string resource wasn't defined in AppBar layouts
Code cleanup..