Started cleaning up html to handle error style