Drop a lot of code duplication and implement a single gagdet to handle/Display status.
This will create a new commit in order to revert the existing changes.
