Issue: css clean up