Made some stuff hide conditionally