More styling and bug fixes