Changed dimensions, added rules for disabled state