Small UI and event corrections
Small UI and event corrections