Small UI Tweaks and added refresh functions