biiig improvement in styling style, removed lots of repitition, fixed edit icon placement