Refactored the html to be sane, also changed some variable names...