Clean + basic css updates