Make the UI look nicer - thanks to  Dimitar K