Lots of gallery UI fixes

Task #2061