Addtional UI Changes