Cleaned up UIActionsSystem