Toy storage ideas for a Harry Potter themed room?

My son has a fun Harry Potter room, but his toys are kept in a clear plastic chest of drawers. They make his room look bad and I'm worried he'll tip it over on himself. I thought about a toy chest, but they have a tendency to smash little fingers and the toy they want is always at the bottom of the box, so the toys don't stay neat. What can I use to keep his toys neatly and safely organized while sticking with the theme?