Styling and bug fixing