Removing unecessary commented code from spotlight code
Various uodates and visual improvements
Overall visual improvements