Simplified plugin code, added Tabular and AutoClose