removed some styling, id name changes