edited UI feedback, few other changes