Added some visual improvements