Improving main UI