Added active styles (sort of), cleanup