change styling and fix bugs.