Add disabled Style + add AFfix feature