Minor UI fixes

See commits.