Fixing issues within CSS ordering