Cleanup, fixes and add monthly usage from menu