reformat css to make more sense
add some styles back