Fixed issues with ui