Bugs correction, code refactoring, button refresh action style
Warnings Correction, Refactoring