Fixed all issues/without refreshing