More smaller UI fixes