Style fixes

The `:not` rules should not live in the generic css. We should find a better way to handle the different layouts.