FIX: Add show parameter and return figure handle