Minor repairs, CSS separated but still bad