Few UI Adjustments