Html Fixes + Front end stuff