Added more class actions, an icon and removed imports