Moved command bar buttons for Windows, cleaned up