UI Adjustments

UI Adjustments - Cleanup