Some UI fixes/improvements, thanks @jpeg729