Merge pull request #3 from acidsmile/master

Html Fixes + Front end stuff