Render UI fixes
Merge branch 'feature/renderUI'