Some small UI Changes