Tests and stuffs

and some minor front end changes

![thanks for the testing img, lukey](http://media2.giphy.com/media/9XRgItPZDUlTa/giphy.gif)