Update Preferences Activity

How it looks - http://goo.gl/bu0ULT
Update Preferences Activity

How it looks - http://goo.gl/bu0ULT
Merge pull request #1 from gubatron/pch

Pch - rebased with latest master commits
Merge pull request #125 from sssemil/pch

Update Preferences Activity