Fixed some basic UI