CSS Fix & CleanUp Code