Fixed css syntax error
Clean up
Resovled conflicts