Minor UI change
Cleaned some of the code
Merge remote-tracking branch 'origin/master'