Mostly changed layout of HTML to be more logical.