more cleanup to style, adding more on CSS