A lot of changes
Adding Refresh method
Avoid crash on orientation change