Fixed minor logic error in Kick Inactive toggle, and minor restructure in preparation for next milestone