added and reordered setups
changed display slightly