Adding some fix for the UI