Fixes for ui part rendering