CSS cleaning & formatting + bug fixes