UI Improvements mostly
Minor UI Update