Fixed issue , moved refresh button to the action bar

Closes #97 and #130