major bug fix to prevent crashing due to bad user control, edited version of app