Exception fix UI Adjustments