Added a bunch of visual improvements