[Fix/Refactor] Server for browser app "cmd vs click" // [Fix] Several small fixes for errors that happend during refactoring