Implemented the command bar, improved error handling