styling and bug fixes