Adding some spacing and changed header color
Cleaned up structure