Fixed flickering bug in some views