added popup tooltip and updated options