@gib: Two levels of featuring and small bugs

![image](https://cloud.githubusercontent.com/assets/555859/5135843/db4e0c1e-70eb-11e4-98f2-e21cc434d128.png)

![image](https://cloud.githubusercontent.com/assets/555859/5135850/f6784644-70eb-11e4-94df-40079a33176c.png)