Bug fixes frontend

![tumblr_mrmfvbyjhx1sa6uifo1_500](https://f.cloud.github.com/assets/3147345/1546321/ccd21fe0-4d83-11e3-8d46-a466e92c6b1c.gif)