Some CSS clean up