IOS-147 + fixed new bug (missing refresh button)