Ma rwd bugs 2

As discussed @ https://trello.com/c/wpZkdlPk/603-rwd-bugs

![image](https://cloud.githubusercontent.com/assets/2247211/4797728/c028ae44-5e0d-11e4-8d06-55169924ca4c.png)