Few minor UI improvements