Fix refresh & remove actionItem
Merge pull request #260 from jmpascal/MERGING-1

Fix refresh & remove actionItem