Fixed all UI bugs

Fixed all UI bugs