fixed active bug and style changes