Remove classes when clearing and CSS tweaks