Updated styling and fixed a couple small bugs