fixed design and markup issues