Cleaning code, fixing css