Cleaned up markup to make it valid with w3