little refactoring
data refreshes and update UI like Android example