Gallery improvements

Had some spare time on a trip: Various layout improvements, fixes of overlapping text etc.