Fixed ui alignment issues