UI tweaked to be prettier