UI Improvements

up