[FIX] some optimizations revoked - caused styling problems :(