Fix to better support HTML 5 Standards & use some CSS instead