Moved hotspots to their own composite view and improved tooltip placement