Fix empty thumb text in square mode and other small fixes