Made some more robust html, still in test form