@gib: Two levels of featuring and small bugs

![image](https://cloud.githubusercontent.com/assets/555859/5135855/06e3beb4-70ec-11e4-81ad-4d1f89d5e049.png)

![image](https://cloud.githubusercontent.com/assets/555859/5135850/f6784644-70eb-11e4-94df-40079a33176c.png)