Made minor changes throughout project to improve the display and to fix lots of errors throughout