big UI improvements