Console refactoring and UI improvements
Merge remote-tracking branch 'origin/develop' into develop
Console refactoring and UI improvements