Add icon and improve aesthetics