Fix styling issues and clean up markup