Report builder view layout refactoring and other small fixes