no magic numbers, some UI changes