OP-975 first part of code refactoring, changed the UI to better use the available space