More logical CSS handling