added labels back and additional design fix