styling and bug fixing