Changes to the resource buildings

Now, I might be talking or OT be talking on behalf of lots of CoC players, but I think this a pretty good idea. We all hate that moments when you're trying to select a trap to re-arm it and end up accidentally clicking on a resource building and as a result you're forced to harvest all your buildings because you want them to start at the same time. So my idea is the following: when you click on a resource building, it gives you two options instead of automatically collecting the resource: 1st option is "Info" and the second one is "Collect". This way it'll prevent the accidental collecting.
Another thing, add a "Collect" button to the Town Hall so when you click it, it automatically collect ALL the resources with one click.

I want no part of a two button system to collect resources. The collect button on the TH would be ok.