fixing markup & styling