Minor UI fixes. No change in the functional logic