added tour filter, improved tour form, fixed layout problems