tweaks to firehorse & touch based menu