removed unnecessary id's and changed a few areas for better semantic