Removed unneeded classes and some CSS fixes