Added IDs and changed some header tags