Feature

Improved styling and fixed a couple of small bugs