Fixed some UI overflowing issues