Fix UI

Before - http://i.imgur.com/CgnuX1K.png
After - http://i.imgur.com/uEtZ3CA.png