Refactored code, added more structure to the page, more commenting todo