Styling and better event handling