minor front end changes and controller cleanup in vio
conflicts and violation cleanup