Fixed changes mentioned in UI feedback by Amir