Adding disabled state and fixing extend for active state