Fixed active class stuff and added an option