updating design to reflect @moollaza 's suggestions