Small screen optimization on tour/tour edit and minor layout improvements