More UI Changes

Commit for Sharing Changes.