Fixes #64 and #67

Also now there is less contrast between the selected and not selected states:

![screen shot 2014-07-01 at 2 36 35 pm](https://cloud.githubusercontent.com/assets/1093373/3447543/b12db5d6-014e-11e4-969c-2bdd2eea1176.png)

(also updated the border and icon colors)