UI fixes by Max:d9d9