Added some small visual improvements