Update tooltip and more styling