UI improvements, implemented Sours