Style clean-up containers, geometry and grid

This is WIP of issue #52.