UI Design adjustments