Master candidate ready

Added Refresh Buttons
other minor Bugfixes