Small fixes with UI