Moved cache clearing to the model
Added toggle button for active/inactive