CSS fixes
Full re-orginization