UI Changes
Merge pull request #3 from ucabpa3/master

ui changes