Merge pull request #57 from scalableinternetservices/anders

small changes
trash icon in location
Merge branch 'master' of https://github.com/scalableinternetservices/BaconWindshield into anders