CSS cleanup, added a few helper classes