fix issue with conditions to only allow repeats where appropriate
ui tweaks