more styling and bug fixes