Some custom UI Changes