my local store Huntingdon recently had a revamp which has included seperating the rabbits and guinea pigs (at last) and a rehoming area too. The area for the guineas and rabbbits isnt massive but its a start. the down side is that they now have some kind of giant rabbit breed and degus too