adding more styling and bug fixes