Removed unecessary independancy+ refactoring CSS